Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 23 Jun 2010 13:17:54 +0000 (13:17 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 23 Jun 2010 13:17:54 +0000 (13:17 +0000)
commit0ae1da2df929d0a3b7465a2e431926dc31ae242b
treea1c7e314d8aef5348acb2f553af91ecf83cdd52e
parentcdf5e19d898e3055d1fbb69a2b382afd1b4800f4
parentc066a0b8a411dc4685e788f9ef95a039a5e7d377
Merge from mainline.